Avoid hardcoding paths in Profile and Sys #59998
Open
+14
−16
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Current code fails when using custom paths. Save directory where Julia source is stored during build in `SOURCEDIR` instead of assuming it can be computed from `BINDIR` (new name chosen to avoid confusing with `build_dir` which is different). Use `DATAROOTDIR` and `DATAROOT` instead of hardcoding `usr/share/` and `share/`. Fix/continuation of #56601, #56627.
nalimilan
commented
Oct 30, 2025
base/Makefile
Outdated
| @printf "%s\n" "const PRIVATE_LIBDIR = "$(call shell_escape,$(call julia_escape,$(call normalize_path,$(private_libdir_rel)))) >> $@ | ||
| @printf "%s\n" "const PRIVATE_LIBEXECDIR = "$(call shell_escape,$(call julia_escape,$(call normalize_path,$(private_libexecdir_rel)))) >> $@ | ||
| @printf "%s\n" "const INCLUDEDIR = "$(call shell_escape,$(call julia_escape,$(call normalize_path,$(includedir_rel)))) >> $@ | ||
| @printf "%s\n" "const SOURCEDIR = "$(call shell_escape,$(call julia_escape,$(call normalize_path,$(JULIAHOME)))) >> $@ |
There was a problem hiding this comment.
AFAICT this new constant is needed as paths to source files are those at build time. BUILD_ROOT_PATH which was defined below was incorrect in claiming that it pointed to the build-time source path as it was based on BINDIR, yet there's no guarantee that the julia executable during build time is next to the source dir.
Failure for `@juliasrc`: SOURCEDIR was "/c/workdir" (giving "\\c\\workdir") on Windows builder, while "C:\\workdir" was expected. Failure for `@Compiler`: missing ending slash meant that remainder was an absolute path. Minor cleanups.
|
CI failure on test x86_64-linux-gnuassertrr seems unrelated. |
IanButterworth
added
backport 1.12
IanButterworth
approved these changes
Nov 2, 2025
IanButterworth
added
the
merge me
17 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Current code fails when using custom paths. Save directory where Julia source is stored during build in
SOURCEDIRinstead of assuming it can be computed fromBINDIR(new name chosen to avoid confusing withbuild_dirwhich is different). UseDATAROOTDIRandDATAROOTinstead of hardcodingusr/share/andshare/.Fix/continuation of #56601, #56627.